Move GtkWidgetAuxInfo struct to private headers

There's no API returning such a struct, it is entirely internal.
Therefore, don't expose it in public headers.

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index a2366d00927b3a843b6f735c82960a30644e8051..c725fcba8caa092c34e03609c6be8e1635765f9d 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -66,7 +66,6 @@ typedef enum
 typedef struct _GtkWidgetPrivate       GtkWidgetPrivate;
 typedef struct _GtkWidgetClass        GtkWidgetClass;
 typedef struct _GtkWidgetClassPrivate  GtkWidgetClassPrivate;
-typedef struct _GtkWidgetAuxInfo       GtkWidgetAuxInfo;
 
 /**
  * GtkAllocation:
@@ -609,25 +608,6 @@ struct _GtkWidgetClass
   void (*_gtk_reserved7) (void);
 };
 
-/**
- * GtkWidgetAuxInfo:
- * @width: the widget’s width
- * @height: the widget’s height
- * @halign: the widget’s horizontal alignment
- * @valign: the widget’s horizontal alignment
- * @margin: the widget’s #GtkBorder margins
- *
- */
-struct _GtkWidgetAuxInfo
-{
-  gint width;
-  gint height;
-
-  guint   halign : 4;
-  guint   valign : 4;
-
-  GtkBorder margin;
-};
 
 GDK_AVAILABLE_IN_ALL
 GType     gtk_widget_get_type            (void) G_GNUC_CONST;

diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 68488064b1228477b0b6726ce910047b87b04e11..55ec21450b99feacc7caa75d3f506a6632f31e50 100644 (file)
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -36,6 +36,27 @@ G_BEGIN_DECLS
 
 #define GTK_STATE_FLAGS_BITS 12
 
+/**
+ * GtkWidgetAuxInfo:
+ * @width: the widget’s width
+ * @height: the widget’s height
+ * @halign: the widget’s horizontal alignment
+ * @valign: the widget’s horizontal alignment
+ * @margin: the widget’s #GtkBorder margins
+ *
+ */
+typedef struct _GtkWidgetAuxInfo GtkWidgetAuxInfo;
+struct _GtkWidgetAuxInfo
+{
+  gint width;
+  gint height;
+
+  guint   halign : 4;
+  guint   valign : 4;
+
+  GtkBorder margin;
+};
+
 struct _GtkWidgetPrivate
 {
   /* The state of the widget. Needs to be able to hold all GtkStateFlags bits